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