Android 5.0.0 release 7
Merge "Fix indirect miuse of $(my-dir)."