am cd6d1f51: Merge "Include subdirectory Android.mks." into klp-modular-dev
* commit 'cd6d1f51e20da71d75e8dbf23ba18b371fb3a8ab': Include subdirectory Android.mks.
This commit is contained in: