Merge "add android_flex_layout for describing all flexible formats." into nyc-mr1-dev