am a21ba585: am 55f0668f: Merge "frameworks/native: convert LOCAL_MODULE_PATH...
am a21ba585: am 55f0668f: Merge "frameworks/native: convert LOCAL_MODULE_PATH to LOCAL_MODULE_RELATIVE_PATH"
* commit 'a21ba585':
frameworks/native: convert LOCAL_MODULE_PATH to LOCAL_MODULE_RELATIVE_PATH