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