Android 9.0.0 release 21
Merge "Use -Werror in external/libpng" am: de8ed1e343 am: adebdf2260 am: f9d17bb77f
am: e500fa038e

Change-Id: I96a6cff405085b78a217493976a5313bcfa33e71