Also change the name displayed by the "android" wrapping scripts. Change-Id: I663e1dcadfef7caf2e42138e39b1237f08091c77