am 06f7d151: am 06da69d5: Merge "frameworks/av: convert LOCAL_MODULE_PATH to...
am 06f7d151: am 06da69d5: Merge "frameworks/av: convert LOCAL_MODULE_PATH to LOCAL_MODULE_RELATIVE_PATH"
* commit '06f7d151':
frameworks/av: convert LOCAL_MODULE_PATH to LOCAL_MODULE_RELATIVE_PATH