Merge "Experimental feature: LOCAL_PATCH_MODULE option in .mk files."
am: 4bb18a8a2e

Change-Id: If15fe3baba14c347be5ac1db668ada41db5da816