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