Android CTS 5.0 release 6
Merge "Fix indirect miuse of $(my-dir)."