Merge "Apply version-script to libandroid library." am: dbacdb242b
am: 5291def66d

Change-Id: I46294a75b19f7e71c5e605d39c5cf32ae7af0890