Android CTS 7.0 release 1
am 7cad9030: am 90479589: (-s ours) am b134d578: Rename libnanopb-c to follow other protobuf libraries.

* commit '7cad9030bffed01414bba3780d2389796d270276':