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