- replace Dir enum with static final int constants Change-Id: Ibfd857e9767f14db92e50edb1681fef0d6598d99