Android 5.1.1 release 16
Merge "Fix indirect miuse of $(my-dir)."