Merge "Added prebuilt_etc package for android.hardware.biometrics.face."