Merge "[frameworks] update with incfs.h" into rvc-dev am: 520ae0a3 am: c3f8ec3e am: 1f0fa934 am: fe28a325 Change-Id: I1fcb7ccc16c55d3437e556ba2311a1075e9cc8b5