Merge "Try to catch more misuse of $(my-dir)." into klp-dev-plus-aosp