Merge "Add statsdprotolite in Android.bp" am: f469bd2f68
am: 748b449887

Change-Id: I94293a1cd5ca457224eccaf98ee1c265a3c3ce06