Merge "Added libinit_headers to Android.bp"