Merge "Update Android.bp files for android.hardware.configstore@1.2"