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