Merge "headers_lib: rename Android.bp"