[automerger skipped] Merge "Change to stub library" am: 99a80f963f
am: c624712880 -s ours
am skip reason: change_id Ibe0eb0c679e59819a89c6b3a93144501acb50cbe with SHA1 3a45246c25 is in history

Change-Id: Id610f0686dd75f9aad7ff651fd4b1ffd9c97f3d5