Bug: http://b/28178111 Change-Id: I46bf95accd819f4521afb1173d8badcc5e9df31c
Keeping them separate is a pain for the NDK, and doesn't help the platform. Change-Id: I96b8beef307d4a956e9c0a899ad9315adc502582