Android CTS 5.1 Release 26 (4485352)
Merge "Fix indirect miuse of $(my-dir)."