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